From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 19 Jun 2009 07:44:33 +0000 (+0100)
Subject: xend: fix a regression in c/s 19791.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13722
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=faefc018df83806c3135b318425fe6c66ffda1b8;p=xen.git

xend: fix a regression in c/s 19791.

Using changeset 19791:c0d2838fc10f, I can't create an HVM.
xend.log shows:

  File "usr/lib64/python2.4/site-packages/xen/xend/image.py", line
  759, in configure
    store_dmargs.remove('-sdl')
ValueError: list.remove(x): x not in list

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 6bbe1ece87..ef6db122b9 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -755,9 +755,8 @@ class HVMImageHandler(ImageHandler):
         if not self.display :
             self.display = ''
 
-        store_dmargs = self.dmargs[:]
-        store_dmargs.remove('-sdl')
-        store_dmargs.remove('-disable-opengl')
+        store_dmargs = [ x for x in self.dmargs
+                         if x not in ['-sdl', '-disable-opengl'] ]
         try :
             midx = store_dmargs.index('-monitor')
             store_dmargs[midx + 1] = 'pty'